Inflation adjustment usa by finozzifa · Pull Request #193 · PyPSA/technology-data

finozzifa · 2025-03-18T11:28:02Z

Closes # (if applicable).

This pull request addresses what detailed in this comment.

The work has been performed by @danielelerede-oet and myself.

Changes proposed in this Pull Request

Checklist

Code changes are sufficiently documented; i.e. new functions contain docstrings and further explanations may be given in doc.
Data source for new technologies is clearly stated.
Newly introduced dependencies are added to environment.yaml (if applicable).
A note for the release notes doc/release_notes.rst of the upcoming release is included.
I consent to the release of this PR's code under the GPLv3 license.

…o inflation_adjustment_usa

…s_usa@

finozzifa · 2025-03-31T09:56:46Z

hey @lkstrp and @euronion. I think this PR is ready to be reviewed!

Copilot

Pull Request Overview

This PR modifies the handling of inflation rate data by updating the prepare_inflation_rate function and adjusting its usage across tests and cost‐compilation scripts, with a particular focus on handling USD and EUR currency differences. Key changes include:

Updating test cases to use the new inflation rate file and support both USD and EUR currencies.
Refactoring the prepare_inflation_rate function and its documentation to accept a currency parameter.
Removing the inflation adjustment block from pre_process_manual_input_usa and adding inflation adjustment for USD costs in duplicate_fuel_cost.

Reviewed Changes

Copilot reviewed 17 out of 21 changed files in this pull request and generated no comments.

Show a summary per file

File	Description
test/test_helpers.py	Added tests for prepare_inflation_rate with various currency inputs.
test/test_compile_cost_assumptions_usa.py	Removed passing of inflation_rate_file_path to pre_process_manual_input_usa.
test/test_compile_cost_assumptions.py	Updated inflation_rate file path and removed redundant test for inflation.
test/conftest.py	Modified test fixture index for inflation data to include USD and EUR rows.
scripts/compile_cost_assumptions_usa.py	Removed inflation adjustment for EUR in pre_process_manual_input_usa and added USD inflation adjustment in duplicate_fuel_cost.
scripts/compile_cost_assumptions.py	Removed duplicate definition of prepare_inflation_rate.
scripts/_helpers.py	Updated prepare_inflation_rate to support both EUR and USD with conditional row selection.

Files not reviewed (4)

Snakefile: Language not supported
docs/release_notes.rst: Language not supported
docs/structure.rst: Language not supported
inputs/US/manual_input_usa.csv: Language not supported

Comments suppressed due to low confidence (3)

scripts/compile_cost_assumptions_usa.py:443

The removal of the inflation adjustment step in pre_process_manual_input_usa may lead to inconsistent cost estimates for EUR inputs. Please confirm that this change is intentional and update relevant tests and documentation accordingly.

return manual_input_usa_file_df

scripts/_helpers.py:199

[nitpick] The docstring for prepare_inflation_rate does not mention support for USD inflation rates. Consider updating the documentation to indicate that the function conditionally selects the row based on the 'currency_to_use' parameter.

def prepare_inflation_rate(fn: str, currency_to_use: str = "eur") -> pd.Series:

scripts/compile_cost_assumptions_usa.py:1120

[nitpick] The variable name 'eur_reference_year' is used when processing USD inflation adjustments. Consider renaming it to more clearly reflect its purpose or usage when applying USD adjustments.

eur_reference_year,

euronion

minor comments.

inputs/US/manual_input_usa.csv

inputs/prc_hicp_aind__custom_9928419_spreadsheet.xlsx

docs/structure.rst

scripts/_helpers.py

outputs/US/costs_2025.csv

finozzifa · 2025-04-01T16:39:59Z

hey @euronion, I think that @danielelerede-oet and myself solved all the comments you posted (thanks again for that <3 ).

euronion · 2025-04-02T07:00:21Z

Thanks ! This makes reviewing much easier :)

Two last (re)quest(ion)s:

Why are some values in the manual_input_US.csv modified?
Since you are modifying some entries, can you also add a proper reference, e.g. URL/Link, to the JRC-TIMES model/documentation from where you are taking the values?

finozzifa · 2025-04-02T07:57:16Z

Thanks ! This makes reviewing much easier :)

Two last (re)quest(ion)s:

* Why are some values in the `manual_input_US.csv` modified?

* Since you are modifying some entries, can you also add a proper reference, e.g. URL/Link, to the JRC-TIMES model/documentation from where you are taking the values?

Hi @euronion thanks for your questions.

I have asked @danielelerede-oet to convert the EUR entries in manual_input_usa.csv to USD. In fact, before the file contained entries for which the currency was EUR and others for which it was USD. This change makes the file cleaner (it felt strange to open manual_input_usa and find entries in EUR) and allows to significantly simplify the inflation adjustment, which can now be done just once at the end of compile_cost_assumptions_usa.py.
we will add the reference you requested!

danielelerede-oet · 2025-04-02T08:46:47Z

Thanks ! This makes reviewing much easier :)
Two last (re)quest(ion)s:
* Why are some values in the `manual_input_US.csv` modified?

* Since you are modifying some entries, can you also add a proper reference, e.g. URL/Link, to the JRC-TIMES model/documentation from where you are taking the values?
Hi @euronion thanks for your questions.

I have asked @danielelerede-oet to convert the EUR entries in manual_input_usa.csv to USD. In fact, before the file contained entries for which the currency was EUR and others for which it was USD. This change makes the file cleaner (it felt strange to open manual_input_usa and find entries in EUR) and allows to significantly simplify the inflation adjustment, which can now be done just once at the end of compile_cost_assumptions_usa.py.

we will add the reference you requested!

@euronion I added a more specific reference linking to the zenodo URL for the model and the specific file we took data from! :D Thank you!!!

euronion · 2025-04-02T11:15:58Z

Nice, LGTM. RTM? :)

finozzifa · 2025-04-02T12:34:24Z

Nice, LGTM. RTM? :)

Nice. Thanks for your approval

danielelerede-oet and others added 20 commits March 14, 2025 12:14

new input file for inflation rates

a1263ff

docu: add more lines from the config.yaml

bf5d2a3

insert inflation rates prior to 2015

5a1f8bc

code: include usd in prepare_inflation_rate and move it to helpers

80a3a5d

remove d columns

67840e9

remove : cells

8be6d5a

code: add unit test for prepare_inflation_rate

b5a762d

pre-commit

321f531

code: add usa and eur inflation correction

cc4994d

code: modify numpydoc for pre_process_atb_input_file

4dc64ec

code: changes

3248b0b

add new output costs

a8ade79

data: convert EUR2010 in USD2010

ab21126

data: round discount_rates_usa to 4 decimal digits

bab04cc

run pre-commit

91469c6

code: add inflation correction for USD at the end of the code

b2bd607

code: remove unnecessary code lines

15f2386

Merge branch 'master' of https://github.com/PyPSA/technology-data int…

4881151

…o inflation_adjustment_usa

code: add pre-commit changes

4c21c43

code: remove inflation rate adjustments from pre_process_manual_input…

016734f

…s_usa@

finozzifa marked this pull request as ready for review March 19, 2025 18:53

danielelerede-oet and others added 5 commits March 21, 2025 17:12

updated_electrolyzer scenarios for us

7115482

update Release notes

1b3c26e

Merge branch 'master' into updated_electrolyzer_scenarios_us

fe87a8a

merge from upstream master

691d971

merge from upstream master

1fefe25

euronion requested review from Copilot and euronion March 31, 2025 15:27

Copilot AI reviewed Mar 31, 2025

View reviewed changes

euronion requested changes Mar 31, 2025

View reviewed changes

danielelerede-oet and others added 4 commits March 31, 2025 20:00

doc: update release notes

b6c0e48

doc: update release notes

4b2e435

code: remove rounding

56f7caf

doc: structure.rst config file 41

1a6af10

euronion self-requested a review April 2, 2025 06:55

data: add detailed source for JRC-EU-TIMES data

a29804f

Merge branch 'master' into inflation_adjustment_usa

11218d6

euronion approved these changes Apr 2, 2025

View reviewed changes

lkstrp approved these changes Apr 3, 2025

View reviewed changes

lkstrp merged commit 756f989 into PyPSA:master Apr 3, 2025
3 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Inflation adjustment usa#193

Inflation adjustment usa#193
lkstrp merged 31 commits intoPyPSA:masterfrom
open-energy-transition:inflation_adjustment_usa

finozzifa commented Mar 18, 2025 •

edited

Loading

Uh oh!

finozzifa commented Mar 31, 2025

Uh oh!

Copilot AI left a comment

Uh oh!

euronion left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

finozzifa commented Apr 1, 2025

Uh oh!

euronion commented Apr 2, 2025

Uh oh!

finozzifa commented Apr 2, 2025 •

edited

Loading

Uh oh!

danielelerede-oet commented Apr 2, 2025

Uh oh!

euronion commented Apr 2, 2025

Uh oh!

finozzifa commented Apr 2, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

finozzifa commented Mar 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Changes proposed in this Pull Request

Checklist

Uh oh!

finozzifa commented Mar 31, 2025

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

euronion left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

finozzifa commented Apr 1, 2025

Uh oh!

euronion commented Apr 2, 2025

Uh oh!

finozzifa commented Apr 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

danielelerede-oet commented Apr 2, 2025

Uh oh!

euronion commented Apr 2, 2025

Uh oh!

finozzifa commented Apr 2, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

finozzifa commented Mar 18, 2025 •

edited

Loading

finozzifa commented Apr 2, 2025 •

edited

Loading